minor fixes
add timer management