Removed old style controls - everything uses a composite now.
Fixing small typos.