reworked debug messages

Change-Id: I7cb9615dcd1ae1ac4d92e4b027eb387a00fe2229
reworked debug messages

Change-Id: Ic4cb1ae67adcd9e8834c166f5051fb86eabbf25c