hotfix: some typos and some mismatch