moved some more stuff around