Fixed some dependencies
some more corrections