Moved init code, fixing a timer glitch