Testing and changes.

Testing application and did required changes.