added some stuff to the lexer/parser
changed lot for the tutorial, probably broke other stuff, heh