random fixes, but the point is that 3.0 is *just* about renumbering, we are very much *not* doing a KDE