Merge "Added documentation, inline comments, and temp debug features."