a bunch of small tweaks