55,56c55,56
<   foreach(node_list() as $type) {
<     $output .= form_checkbox (node_invoke($type, 'node_name'), NODE_TYPE . $type, 1,
---
>   foreach(node_get_types() as $type => $name) {
>     $output .= form_checkbox ($name, NODE_TYPE . $type, 1,
144c144
<         drupal_set_message(t('Your vote was successfully registered.'));
---
> 	drupal_goto("node/view/" . $nid);
165d164
< 
167,172c166,180
<     case 'view':
<       if ($page) {
<         if (variable_get(NODE_TYPE . $node->type, '0')) {
< 
<           if (_nodevote_vote_is_visible($node->nid)) {
<             $node->body .= theme('nodevote_display_vote',$node->nid);
---
>     case 'load':
>       if (variable_get(NODE_TYPE . $node->type, '0')) {
>         if (_nodevote_vote_is_visible($node)) {
>           $object['nodevote']->vote_display = 1;
>         }
>         if (_nodevote_is_votable($node)) {
>           $object['nodevote']->vote_do .= 1;
>         }
>       }
>       return $object;
>      case 'view':
>        if ($page) {
>          if (variable_get(NODE_TYPE . $node->type, '0')) { 
>            if ($node->nodevote->vote_display) {
>              $node->body .= theme('nodevote_display_vote',$node->nid);
175c183
<           if (_nodevote_is_votable($node)) {
---
>           if ($node->nodevote->vote_do) {
231c239
< function _nodevote_vote_is_visible($nid) {
---
> function _nodevote_vote_is_visible($node) {
234,235d241
< 
<   $node = node_load(array('nid' => $nid));