Js improvements