Changes as a result of PR feedback - mostly cosmetic.