Centralized Headers, Fixed bugs