fix scratchpins/timers bugs