More comments, working around stupidities within prior design
template change, slightly