added timers to demo

including minor modifications to other files