a bunch of slimming down and more polished functionality