Progress on Quantum Discord of Two-Qubit States: Optimization and Upper Bound