Added some final tweaks