added more commenting, removing dead code.  This should be the final commit before the branching occurs