Improve server and add cyphering