Various changes in formatting and corrections
Correction from Manish Sud