further tweaks and fixes