Fixed shuffling and answer logic bugs