more server.js changes