Fixed the issue i talked to you about earlier, but it appears that we should close the sockets manually - maybe its a good thing though. Added some more todos...