Minor edits - mostly around address registration.