Changes to some string values. Also maybe some comment changes?