fixing things up