More improvements to stunts.