tweaks missing from last commit