Some more stuff
Disconnect timeout is crappy shit atm, will make it good later