More changes, now to draft 1 of official paper