Fix quick skip and add instant replay.