Removed demos again + added fix to concordance and ${templates} bug