fixing things up a bit