Some updates and fixes and corrections

Here's some fixes for the add on.