Local-Client & Network: small updates