minor rejigging; moved some stuff up from streaming section