Ore-Fest! (and a cheeky fix)

Ping me if I missed anything