mostly notes, lots of general mods
cleanup