All of the above. Plus till in grass clippings...that have not been chemically treated lawns and anything else you would compost, incorporate into the soil. After your regular season is done, plant rye seed for a late fall winter cover crop. Then till that in early in the next growing season. If you have leaves to rake in the fall, shred those (a shredder or lawn mower) and till under. Do not use black walnut leaves. Anything organic will help amend your soil. It takes time. I have been working on my garden for ten years and it is getting OK but not as good as I want.
Any manure is OK if very well composted. It is best if it has aged at least a year or more. Be aware there most likely be weed seed in the manure even if it was brought up to temperature during the composting.
This all part of the fun of gardening, so have a good time with the process.
