tweaks to timing to make ff and safari not be so terrible
Merge branch 'refactor'