fixed ALL js issues
add js fixes to master