some few tweakings