misc fixes to update draft