Fixes timing diff when pausing and restarting

Other small improvements