more updates to js..
Merge pull request #4 from joshfry/master

more updates to js.. WOOT