Did some more tweaks