some timetravel and bag fixes