more detailed progress messages and minor changes in cleaning up