Added more diagnostic utilities
updated diag utilities