Added drafts
Minor fixes