Split qpt patches, and improve the actual system as well.