bug fixes up the wazoo part 2 (resets)