type info / address added, along with some extra paranoia about bad objects