Improved error handling in parser. Added expression parser.