Bugger or not you've done a nice job of both. On 22, instead of following block recommendations, I think if I would've made a center 4 patch of the one big triangle and 4 smaller triangles x 4, then sewn 4 flying geese blocks and added the smaller triangles onto the ends and put the final corner triangles on, the block would've gone together better.