made some tuning to js, and broke some stuff'
q