Added some debugging tools back