Some more minor changes

- Variables for internal functions should now be correct
- Manage class should now be defined correctly