several minor tweaks