A few tweeks here and there