Work

- Bugfixes on ContentManager (removed deadlock)