resolved more todos