made some tweaks