Updates to timer apps.

This should fix issues with timer app. Also minor updates to file headers.