header fixes and more const