changed mail filename, added import option, command options wrappers,
config in separate file