(colloquial) put (matters) straight; settle satisfactorily.
(colloquial) put (something) in proper order; tidy up or sort out (something). A variation of square away.