Fix some timecursor logic, be smarter about positions