Added fixed debug tools, now included in git