Spelling correction
Added more TODO's for `import`