Update numbers + minor changes to draft.