More alignment fixes
Fix typo
Comment cleanup