Updated to fix potential issues with waiting, sleeping, and fast-travel