Kevin's changes and more js fixes