changed comments and header comments
Merge branch 'core-refactor' of https://github.com/webdetails/cpf into core-refactor