Second timeline fix and cursor for map