Delay threshold and a few other changes
Lint fixes
Quench annoying Wreorder warning