all nodes now manually constructed
generalize terminology
added streams