Convert challenges to a list + other fixes