ore collector, last fixes and tweaks