Visualizer

Polish, fixes, refactor