Add progress state; clean up; suppressions des trucs inutiles