ranking module form does not display, number of accepted options wrong

Related to a similar problem in selection.module, there was a problem with an extra & in ranking.module. It also was using the wrong number of options when using the ranking. Here is a patch that I used to fix the problem in the HEAD version.

68c68
< function decisions_ranking_voting_form($form_state, &$node, $teaser, $page) {
---
> function decisions_ranking_voting_form($form_state, $node, $teaser, $page) {
86c86
<     $num_choices = count($node->choice);
---
>     $num_choices = count($node->choice) - 1;