move some more stuff around a bit