Tweaks to JS