- More cleanup
- Fixed a few more things