Fixed and updated some dependencies
Fix conflicts. Merge.