I like "Bar Keepers Friend" it is like Comet only less abrasive.
Bon-Ami is the same thing I think, sort of gritty like Comet but guaranteed not to scratch glass. I've cleaned my windshields with it numerous times prior to hitting it with Rain-X and it works great...plus, it's dirt cheap.