add timer
minor stuff