fixed js
some changes