Added some finishing touches