Cleaned up template, fixes for header files