diagnostic additions and improvements