Commenting, formatting and a few updates.
Formatting, commenting and updates.
Merge branch 'master' of https://github.com/esd-soft-eng/server