Fixed most of the stuff in the header for now...