Done updating for bad addresses.
Updated listeners to new interface.