Refactored time header, fixed Makefile