some javascript fixes
Merge pull request #30 from taylorcressy/specialbranch

some javascript fixes