minor layout changes

Just some layout modifications: Break around 80, some more spaces, and move the default vars up.

The @output section needs fixing.