Added more detailed check routines and diagnosis