Minor output cosmetic changes.
Added assembly support.