Alignment justification and minor fixes.