Minor work on registration, and privacy stuff.