lots of minor tweaks and fixes