general cleanup on flow and visualization.