.js update

Syncing up with Joe's stuff