Better logging. #126