Js translator improvements

Additional commits will be added by Friday :)