Corrections, re-organization