A few more improvements to the input-parsing code and a couple