Better logging and remove some warnings, #155