more js fixes
more js fixes