Last minute changes, adding some notes