Fixing few things as per Meena's suggestions.