Upgrades dependencies
Various Fixes
Resolve conflicts