Add comments to _main.js, remove finalize
Merge remote-tracking branch 'upstream/master'