Small corrections
Reorganizing