DebuBug fixes, debug messages added