lots of fixes
Localized JS