Add JS
Fix www build
Merge