Cleanup. Copyfield fixes. docval on 5 fields