Ported better handling of nonexistent streams
Added units to axis labels