added JADiag.cpp and made some of the other suggested edits