Further plot updates per Di's suggestions