Addon Fixed

Addon Now working (minor bugs)