Fix some stuff, move some stuff, add some stuff.