Massive cleanup and organization, worked on comments and endgame
announcements