added handling for PO Boxes and some better text parsing