Minor clean-ups and adjustment of a delay that was too long