Change to black and white and other improvements