Cleanup

- Fixed a couple typos
- Removed extraneous comments
- Fixed some leftover paths that were not fixed before