Added more verbose logging to narrow down issues and some notes as to what needs sorting out still.