Added missing Ore types. Tidy up of dictionaries.