City conversion, new PR per Scott req, fixes some server.js stuff