More issues with timing has been fixed.
