Fixed pretty much every arrow, and added missing dependencies