version control modified and js fix