What is the difference between free-will and randomness and or non-determinism?

In relation to the question " What are the necessary conditions for an action to be regarded as a free choice? ", it came up that one way to insure the possibility of free-will was to have more than one choice. But that doesn't separate free-will from non-determinism or from randomness. In the context of a human making a choice, wanting to know 'Are my actions predestined?', 'free-will' means they can make the choice, 'random' means the choice is unpredictable (but by who), and 'non-determinism' means there is more than one choice. What is the relation of these three concepts? I think that non-determinism is a necessary condition for the other two, but that one could have free-will but still be predictable, and that randomness does not imply willful-ness. Is that an acceptable reading of those concepts? If not, what are alternate workable definitions?