Commentary: More cleaning up.
Merge: Conflict Fix in header file.
Commentary: Spelling and grammer corrections.