Many small corrections. Improved consistency. Fixed typo.