Small changes to grammar, first impl. of scanner