fixed header issues and initialization list issues