some more renaming and some testing. please see TODO comments in SyntaxAnalyzer.py