Minor Changes to Parser