more js fixes