fix grammar and update running as server