add some tweaks