Major refactoring, comment rewriting, faster updating, miscellaneous stuff.