Added stuff for 2D code, more coherence2D test work...