#61 minor tweaks