added some tweaks