lots of display fixes