Adding headers and fix some README doc