debug improovments