a few cosmetic changes according to the spec
a few cosmetic changes according to the spec, changes made to CatalogServer