added more debug to OpenAddressMapper
a few small changes, nothing critical