cleaned up 'nextUpdate' and timing issues