added email support
bunch of updates