Fix typos and missing parts