FIX: server.js, DB updated