final fixes, with js and url