Fixed some things and added email