cleaned up some of the headers and rearranging the order for some of
the elements to make put them in a more logical order.