Added address book, fixed some bugs