Various corrections.
Corrections