More QoL improvements