Optimisation of Size
Some Internal Changes
Update PHPUnit tests
Update lexer/parser