js issues fixed