corrected some line lengths and DEBUG wrappers