Updated comments.
Clean up.
Updated header comments.
Some cleanup.