Js fixes

@etpinard 

new PR, reverted to before I ran run.py