Fixed typo's and imports