vendor those new deps and fixup some typos