#68 minor tweaks