More progress, and cleaned up logging messages