Some late edits
Close to ready