Small changes and fixes
Added JS duplicity stoper