Did some tweaks