fix rest of js issues