Some suggestions added
locale & this fixed