changes to MilliChrono, save state implemented
more conflicts