Solved dependency problems
minor changes