Bugs removed, visualization seperated