cleaned up comments, removed a few accidentally committed changes