New template for header file; some fixes