fix msg
Minor tweaks and initial ChallengeModel