- Cleaning up some derpy names
- More cleanups, some documentation, a bunch of deprecations.