add more diagnostic messages