further additions to container, not nice but rare
Merge branch 'spaces' of https://github.com/winfel/wa_knowledge_structuring into spaces