more tweaks to get things working