Style and copy edit
Add new server api