updated some stuff
removed duplicate returns in app.js as well as the next() fn