updated client and server
rm of some TODOs