further tweaks