some minor tweaks to get things working