fixing stuff and emails