Scanner and Parser modifications.

Made the code a bit clearer and also added line number
and column number info to scanner.
Parser proper validation /wo assert.