a bunch of final tweaks