Added underscoreize to parser, fixed pluralization.