Profiles redone, cleanup