Added some final fine touches