Fix off/on, added stacktrac