move some stuff around and made doc more evident.