Improve parser, add simple Statements.