syntax cleanups so far

- preparing merging into master
- there are large commented code blocks
- need to do something about the namespaces mess