Straighten up some assignments