some tweaks ..