also pickling nonhomonym and homonnym name -> IDs separately
removed some old misleading comments