Add more luma/chroma logic and correct some nodes.