Drupal commerce added + minor improvements