minor tweaks
minor fixes