latest bugfixes for viz branch