make myjs more generic
fix source test toggle for js
merge