improved STARTTLS usage