Security service cleanup.
Various changes.
Add missing files.