worked on gathering data for diagnostic messages and some other misc cleanup