fixes from review 1, privacy review