More improvements for viz

See #41. Also includes a bunch of fixes.