Some updates to server.js