Fixing a few of the bounds on the major elements

I have an XML schema editor in Eclipse that is helpful for this, but I just did this edit by hand.

I'll go over it more thoroughly later.