Retooling timing; doesn't really help so far
Merge branch 'master' into retool-timing
fix IE regression -- it throws some weird errors?
cleanup stop/start logic a little