De-activate previous source when switching to Drupal comments #22

also fix some php warnings for undefined variables.