Fix accidentals, margins