Fix(?) battle system and change how time trails work