move some things to fix some things