More tweaking of ore dictionary scanning