Updated comments and config code to match.
Removed difference comments because Git keeps track of that kind of stuff...