Re-Add ElementalX governor + some fixups

This reverts commit 7fe2e8115d4254dccb0331a06784010ad8e29be7.