some more tweaks here and there