fixed bug and added feature in Add-on