add fixes in JS