Fix typo and lost parts