lots of small tweaks