General improvements and minor corrections.