add some things to addressbook.c
Fix merge conflicts