Corrections, various changes