Fixed the remaining bugs that kept Drafts from working properly