Improved code comments.
Final comment and includes adjusts.