Multiple changes

- Added missing includes.
- Moved some managers functions to the .inl file.
- Other updates to manager.