* More js cleanup
* Removed syntax errors