More changes to parser, still buggy