tightening up logging, continued testing