smtp added, features upgraded