Cleaned up comments and some other details.