Few issuess fixed.

Plese check it once