More slight bugfixes to Queues and Nodes. More changes pending on decision on whether or not to abandon template functions.