Remove requirement for -f cli param.  Fix broken copyright headers.