Improving of SmellGift and fixing bugs