fixes and js is done