Minor fixes and removing main.js