minor js changes
Merge branch 'master' into basic-changes