Normalized serverError, cleaned up comments, made sense of policy

Normalized serverError, cleaned up comments, made sense of policy