- Optimize Visualization
- Some bug fixes