js work and some changes