further tweaks;