Have gotten rid of most printfs; some are still left.  Have not merged master yet.