more tweaks #61