Fixed visualizer shtuff
merge