Yeah correct, the two year estimate was actually one Martian year, so pretty close. Obviously, its well passed that milestone.
Yeah you are correct! Here is an article all the way back from 2005 - https://astronomy.com/news/2005/03/mars-dust-devil-whisks-spirit-clean