minor updates to improve reset scope