Re-enable plugin disclamer

- Fixed some bugs
- Tested
- Ready to be use and tested more in develop