Bugfixes, Better Visualization