Minor changes.
Cosmetic changes to prepare some bigger changes.
Added the draft of a generic socket server.