There are three bolts, and the top one sucks to get to. I hope you have a lot of different extensions. Are you sure the starter is bad? Same thing happened to me and I threw a new starter in it. Still did not start. I had to run a ground wire from the neg side of the battery to the engine block itself, and shazam it started right up. If you know for a fact it is the starter, have fun with that. But if you are not sure, try getting a set of jumper cables and connect one side to the neg of the battery and the other side to a good spot on the engine. If it starts up just run a ground wire to the engine.
Now you tell me. This is what I get for being bent out of shape and "going for it". Yeah, that top bolt was a biotch. I bet getting it back in will be twice the fun.
Anyway, you were correct, but not fast enough, starter checks out fine, though now I will replace it with a new one, since I have it out.
I'm going to assume it's the clutch safety switch?!