Fixing Errors/ Added Socket class