2 tablespoons olive oil

1/2 cup chopped onion

6 cloves garlic, finely chopped

1 pound ground beef

salt to taste

1 (10 ounce) package frozen chopped spinach, thawed and drained

1 (12 ounce) package manicotti shells

2 cups ricotta cheese

2 eggs, beaten

3 cups spaghetti sauce, divided

2 tablespoons butter

2 tablespoons all-purpose flour

2 tablespoons chicken bouillon granules

2 cups half-and-half

1/4 cup chopped fresh parsley

1 tablespoon chopped fresh basil

1/2 cup grated Parmesan cheese