Fixes and cherries..
fixing merges in stage1.js stage2.js main2.js