Fixed some spelling and imports