remove _flow_map from state, improve logging
bring failing tests back into the double-digit range