added phone numbers (#2)
code cleanup
added addresses (#1)