Update on Copyright statement and CS fixer