I had the same thing happened to my X530 in the first days of usage. I had to go down to the dealership and purchase a quart to top off the reservoir. The swirl marks I would use Maguires wax and a DA buffer from Harbor Freight, it will make it shine better than when you picked it up.