Update and made more tweaks