More alignment tweaks; newline insertion tweak