cleanup
move some stuff around, small changes