Slowly fixing things up.