Rate limit state changes

Also clean up creation and templates
Fix a panic on stop logging