1) you're right, just use 2 bolts
2) check the bulb in the cluster first. Easier to test than the sensor.
3) rotors will get rust on them 10 minutes after it rains. Just drive it around and the rust will work off. If it's been like 4 months, you may consider getting the rotors turned...