did some tweaks