some tweak and js changes