Commented remaining headers and cpps