Minor cleanup and additional log messages to give a better idea of progress.