Greatly improved debug