Many minor improvements and corrections to wording