adjust one more calculation to require >= 2
move move stuff into dynlib.
remove daniels work and explicit instantiations
more clean up