feat: minor improvements. avoid clean directory on extract error. added fw dependency instead of async