minor changes to parsing.