Fixes to the manager, but it's still not working correctly and I don't know why...