bug fix and include challenge achievements