move some things, fix some things, sorry that is vague