I think this is basically right, but I'd point out that aid can include things like education and giving money to build infrastructure, which assist greatly with (2).