more cleanup
misc mods
fix calc cov