Fixed faktor typo in grammar and source
Basic expression compilation
Merged branches