removed all partial imports and all import * with the aim of avoiding potential circular imports issues and increase readability. Fixed a couple bugs along the way