retro-trail: cleaned up the class-related words, toggled a bunch of TODO markers