New drafts and some tweaks to old