Addressed Brad King's Change Requests

Addressed comments from Brad King on the state of the code.  Attempted
to resolve all known outstanding issues.  There were no bug fixes or
other functional changes. Tested under Visual Studio 11 x64.