Cleanup of code base; extended reporting, fixed issue with stop() function, added comments