resolve template hierarchy issues
prep for release