Making defficiency security less shit bit by bit

Changelog included.