OreEntry changes and API stuff