Updating to latest templatebuilder. Minor updates otherwise