Made some tweaks