Some more changes to support the Presentation Layer
More code for the Presentation Layer (and a lot of inconsequent updates
because of whitespace).