server + client: minor updates