more tweaks
client should know its own id