Improved visualization, discovered 2 bugs?