some tweaks here and there