minor js changes
merge