Some fixes, js file update