Made some final tweaks