just some minor tweaks here and there