Worked a little on parser.