Improvements to setting/resetting various modes