Thanks for all the tips guys, I'm following the advice and it's MUCH better now, no new spots, no rust, etc.