Cleaned up comments, fixed a few errors