Add dependencies
Fix for real
Update docs
Fix conflicts