few tweaks here and there