New .field template, small fixes