I finished my shorts! They're a bit rough and ready but they fit better than a lot of my shop bought trousers. And I don't think I've ever had shorts that fit this well. I haven't had a lot of luck with shorts.
I accidently under stitched on the outside of the waistband, but that's because I tried to place it using the diagram, but I should have just held the waistband pieces onto the shorts and worked it out that way.
I still haven't mastered button holes, but I've got some poppers somewhere around here from my gingham dress and I'll probably find them before the weather is warm enough to wear these outside. :-)