tweaks here and there