Fixed up minor things, next is messing with sockets API :D