made some minor tweaks here and there