fixed template list in preparation for fixing template inheritance
fixing some github issues