misc last changes before blocked

Without the template table being defined, I don't feel comfortable
writing more than these last few edits.