Output properties in main content also

This change makes it possible to output properties in the main content with any comments and tags they may have.