minor tweaks
more tweaks