some tweaks,