bug fixes

- Global adjustments
- A bunch of bug fixes and sintaxe fixes
- First working test bench