Update drafts and minor changes in key names and examples