fixes for timeframe management