misc tweaks;