Fixed some issues with moving from one challenge to the next.