update script for challenge
fix scalar simplification
Merge branch 'hotfix-scalar' into develop