Includes changes tested during TR1 2023 with major verbosity review