Correct grammatics, add 2 more headers, clean up source code