Code review for server side code.

See notes below.