Add some finishing touches

Add some finishing touches