fix some minor errors

Trouble adjusting Adam sentences, they are all fine anyway:)
Merge remote-tracking branch 'remotes/origin/server-impl'