more tweaks to parser.rb