2014-06-07 23:00: fix some bugs in the parser.