Cleaned up comments
Fixed a couple merge conflicts