Lots of import fixes and print