delayed: fix multiple bugs