- more renaming
- typos & docs