Started out with some combo drills on mitts. My partner noticed that I wasn't putting my shoulder into my uppercut. After tweaking it a bit, I noticed a lot more power when I get my body turned just a little bit more.
We then both put on gloves and worked some counter-punching. One person would jab, the other would catch it and immediately jab back. We did this with jab, cross and then jab/cross.
After that we did some clinch drills, some swimming and then some knee defense. When someone throws a knee in the clinch and it goes above the waist, grab it. Then you can sweep the other leg in myriad ways. Grab it only if they bring it up above the waist, don't reach down for it. If you can't grab it, you can place a hand on their waist to create space and keep their knee away.