made some minor tweaks