clean up, js fixes and english text fixes