Fix/system time

Among other things.