Fixed more issues in the lexer and the parser

Signed-off-by: Vinzenz Feenstra <evilissimo@gmail.com>