Some more cleaning up and ChestOre added