fixed some bugs with address and office