Incorporated some code-restructuring changes from main structalign
branch.
Changes to print statements.