Many minor improvements.