Changed headers and made a few other adjustments