changes and corrections needed by resets (still need some work)