Minor update to delay method and some comments