latest changes from dgbas.
fix incorrect lookup
fix incorrect reorg info