lots more cleanups to Container::....data structure code to make work on gcc/linux (gcc more picky about templates - typename esp...)