more hindsight tweaks
more obvious tweaks
tweaks
class stuff