hi, starter motor stopped working sunday, it was just spinning and not engaging so took it off and spun it and it worked fine so gave it a little clean and put it back, been fine since then up n till now its stopped again and just spinning like last time is it dead or is there something im missing any help will be appreciated.

Oh and also my engine management lights came on could they be connected or is my punto taking a turn for the worse lol.