better logging
more cleaning; added progress and dry-run

both are really needed.