found out about nrmb_correction factor in cg.h
resolved bug in dz.cuh
resolved merge conflicts