Renamed Surface to Display, among other things I forgot. :P