Format Improvements

Improvements made to the formatter so that Else { } statements work (at
the risk of breaking citation formatting) :\

Creating new documents had some bugs that have been squashed.