added some tweaks for better user experience