Ore Dictionary Values

+ Some bug fixes