some further tweaks and changes