Significant improvements/implementations across the board.  See files for more details.
Removed unnecessary comments.