Corrections, improvements