Terrors finished

There's some weird stuff happening with other items, but I think it's a
fault mostly of duplication and some other weird debug-only situations.