landed some patches, and wrote more patches