Fixed importation errors.
Fixed importation errors.
Fixed up small problems thanks to unit testing