Some updates and use flatland.ordered.