fix stupid typo's and reorder headers