More #111 and #155
#155 and some #111
More logging #155
Better logging to debug #145