Plugins update

This merge introduces the following:

- Minor bug fixes
- Completed and optimized versions of the class and state plugins (still needs testing!)