update todo, fix some account emails stuff