fixes
Debug class and fixes