Perfected yield timings

Also fixed constant yielding.