Various Improvement.

Some modes added