Some minor improvements.