making some tweaks