some code tidying
added drafts