*ProtectionModule: Bugfixes, Cleanup, Rewrites