Minor tweaks to main.js