fixed things a bit