Added some debugging enhancements.