more tweaks #787