fixed things in both