move some things, fix case