Tidy tidy
Update CHANGELOG
Update headings
Bump OR dependency
Avoid adding additional timers if started already
Simplify queueing blocks