Template method added/revorked, minor fixes