Misc changes

- Improved comment formatting
- Moved some code around
- Added features listed in readme but not actually implemented, oops