Adding first viz and bug fixes