Many changes

- new tabbing
- added comments
- renames and spelling fixes