various fixes, check last email