small tweaks here and there