Improve timings and curves on transitions

If anyone doesn't like this, it's easy to revert, so it's going
straight to master.