moved setting to profile-settings
Fixted syntax bug
Moved the special case after super wrap
Removed commented out blocks