Implement comment system and some cleanup.