fix and move some stuff