Update to javascript and some more small niceties