js fixes
js fixes