Added more, better logging. Refs #1900