Header Revision and general update