More drafting; cleaning up