added server processing
code cleanup
merge
server implemented