Updates for oga's comments (server.go)