bug fixes
Inclusion of server socket connection