some comments corrected