Some touch-ups in the assignment section