Add some finishing touches