more tweaks on debug