Possible Clues:

• Untangle
• Make sense of
• Resolve (a problem)
• In order to get things right
• Organise alternative drink outside
• Kind of not in to arrange this
• 'Grade our tots (4,3)'
• Deal with kind public
• That's kind of not at home - you'll have to get it in order
• Deal with porter harbouring gold