further tweaks
fixed merge