changed some debugging behaviour