Some updates and fix for some visualization problem