improved debug messages as requested