Js/a few tweaks