minor tweaks #49 #60