suki22- Try to maintain reasonable expectations about the
water spots 
After some aggressive rotary work, my wife's A8 *still* has etching and she finally told me to just leave it alone lest I thin the clear too much. So really correcting etching with a PC just might not be too likely.