small fixes
fix to timing logic