tiny tweaks.
Circuit visualizer is not a post-processer called draw_circuit

clean up cmd-line args
misc cleanup.
merge