Fixing some of the bugs
updated sharing and gift it.