after i wash i use Autoglym glass polish but this isn't getting off the water marks. i need something better, more abrasive. there's also marks from the wipers which need to be removed. any pointers?