small clean up of initial
part way through everything...