+1 on the advice given about the oils to use. To get those waterspots off, use MAAS polish and a Q tip, works great! Just avoid any goldwash as the MAAS will remove it.