Few JS and other fixes