Fix flow
fix copyright headers