hotfix_branch: some typos and bugs

thanks James!