Improved Analytical Evaluation of Air-Gap Fluxes and Forces of Ferromagnetic Smoothed and Toothed Structures and Pole Shoes