I'm glad it was mostly successful and hope you'll find something to deal with the HCl stain as well.