Add TODO
Fix bug in ljsp code emission
Tidy up AST classes
Add TODO
Rename vars