Removed some drafts
Tidied up the tag handling