Small edits to go along with main.js changes