fixed things up a bit