make client/server work
cleanup