adding better navigation to thought residency and correcting order