Integrated with TV and BOOK scenes, minor improvements in other scenes