[fix] Various typos and ergo bugs