Fixed visualizer, made source/sink into factory methods