More changes to parser, handled all parameters