more fixes and tweaking to server/client messages