lots of small tweaks.