Changed streams to extend filter streams; added more comments