mostly expanding comments; also a couple small fixes
housekeeping: remove outdated things, more renaming and moving around to keep things logically organized