Fix timings and glitchy disco