change ldap timeout back to 10S.

and other small fixes.