fixing dependancies and imports