fixing tree and dependencies