minor template changes, clean up