fix timestamps and display ordering