Fix so that comments can go elsewhere in input file