The difference between assault and battery

If I remember my old business law course correctly, if I take a swing at you and hit you, that is assault and battery. If I sneak up behind you and hit you, that is battery, but not assault, because you were never in fear of harm. If I take a swing at you and miss, that is assault, but not battery, assuming you can prove you suffered some harm because of the swing.