Fix some looping and pausing.