Cleaned up comments, minor fixes

Also some minor fixes.