Tidy up and add notes