Fixed challenge progression bug etc