Fix some solution due to change in key parsing
Add some new challenges solution