Bug Fixes, and added Token CRUD plugin functions.