improving debug some more