straightened out some imports vs depends issues