This patchset contains the remaining patches from the first round rebased against the current head with the whitespace errors removed. Additionally it incorporates more fixes from the list of tasks from the controller audit. Scott's feedback to the original patchset has been incorporated into this revision.