Added tokens to parser, fixed errors in scanner