propagate step 5 server.js fixes to step 6