Improvements.

Add few improvements.
Updates.