More guidelines fixed.
Resolved conflicts.