Updated lexer and parser - if blocks now work