Update - clean code, add ores to ore dict, buch more