Formatting edits and editing the coupling of some variables
Some edits, began skeletoning the Diagram types