Fixed typo bug and import bug