fix: typo and various