fixed last js issues