Tweaks to index.js