+ The "add new comment" was missing for polls. + Renames $main to $teaser where appropriate to follow latest Drupal conventions.