Added some diagnostic information.