add templates; cleanup step helpers;