Add SelfControl list
Minor changes. Commit message skipped.
Minor changes. Commit message skipped.