Proposed treaty wording to prevent WWII

Using the link below, prepare a consolidated summary of the original treaty text provisions/wording that you think should have been done differently so as not to provide the catalyst for another war.  Focus only on part 2 and 3 (boundaries)

Treaty of Versailles: http://www.yale.edu/lawweb/avalon/imt/partxv.htm

I am attempting to defend Germany as they were blindsided with the admission of fault, and while I have all the other areas covered (economy, military), I am fairly weak in understanding the history of the geography, boundaries, and what these boundary restrictions mean to their existence.