Added commenting to challenges
Merged Haval's changes