more delaymachine things
minor comment changes