Editor: container system support (closes #27) and minor code optimisation