Fixed XclusionManager using different logic.
Mostly moved stuff around.
Major bug fixes and cleanup.