Bonus added

+ Many bug fixed