Tons of improvements with timing and config management