Template fixes

This is a resubmission of the earlier request I accidentally added files to. Basically the logic here is to find the narrowest variable and work out - look for current values from @host and if not pull the defaults from _new.