a couple fixed things