Fixed some more ruins, re-categorized others

disregarded obsolete/generic changes, because those are still in
testing...