some additions, plus move some stuff in other locations