Fix code for 2.7.  Clean up csv read/write.  Streamline.