Fix indentation issues, turn back on CheckConnectivity, and add back in is_flow_mod