Corrections and layout