Bunch of stuff.
Changes made by Sebastian, Profiles, Control.
Merged.
Merged