Fix some typo and fix some alignment