A few corrections.
Merging
A few menu tweaks, working on jscript.
Post merge commit.