Finishing touches, fixing import warnings