Fixed issue 12. Changed and rearranged heading info