improved dependency managment a bit