updating some javascript
some changes
Merge branch 'patrick'