cosmetic work, minor improvements.