Tidy up my config a little and fixed a problem with the new org-created ability