Added Comment functionality
Cleaned up comments a bit.