todo notes and fix for noDelays not updating properly