Some cleaning and add email stuff