better viz code, add clustered sample viz